GitSigns: Implement "One Fat Diff" option#15
Open
mihawk90 wants to merge 1 commit intoTypesettingTools:mainfrom
Open
GitSigns: Implement "One Fat Diff" option#15mihawk90 wants to merge 1 commit intoTypesettingTools:mainfrom
mihawk90 wants to merge 1 commit intoTypesettingTools:mainfrom
Conversation
Depending on the original file it was possible for the diff to fail. This happened specifically when a chunk's anchor line was over 80 characters long. In this case git's unified diff output shortens the chunk's anchor line. Since the script was searching for a subtitle line identical to the chunk's anchor line, this would fail. This introduces an option to bypass looking for the anchor line by having the diff just be one huge chunk instead of invididual chunks per change (±2 lines). Note we're intentionally not saving the one_fat_diff variable because it's supposed to be an intentional choice, not a default when it was used once.
mihawk90
force-pushed
the
gitsigns-one-fat-diff
branch
from
32d2cfa to
4ea3397
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Depending on the original file it was possible for the diff to fail. This happened specifically when a chunk's anchor line was over 80 characters long. In this case git's unified diff output shortens the chunk's anchor line.
Since the script was searching for a subtitle line identical to the chunk's anchor line, this would fail.
This introduces an option to bypass looking for the anchor line by having the diff just be one huge chunk instead of invididual chunks per change (±2 lines).
Note we're intentionally not saving the one_fat_diff variable because it's supposed to be an intentional choice, not a default when it was used once.
Fixes #14
PS: Not sure about the proper next version, but I guess it's a new feature so semantically it makes sense.